From d9f7d7205e2b99f178674a87400569450864b906 Mon Sep 17 00:00:00 2001
From: "E. Dunham" <github@edunham.net>
Date: Mon, 10 Oct 2016 11:11:56 -0700
Subject: [PATCH] Expand matrix for #3186

---
 appveyor.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index a6009fa5f..7c9839c2f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,19 +1,25 @@
 environment:
   CFG_DISABLE_CROSS_TESTS: 1
   matrix:
-  - MSVC: 1
+  - TARGET: i686-pc-windows-msvc
+    MSVC: 1
     BITS: 32
-    TARGET: i686-pc-windows-msvc
     ARCH: x86
-  - MSVC: 1
+  - TARGET: x86_64-pc-windows-msvc
+    MSVC: 1
     BITS: 64
-    TARGET: x86_64-pc-windows-msvc
     ARCH: amd64
+  - TARGET: x86_64-pc-windows-gnu
+    ARCH: amd64
+    BITS: 32
+  - TARGET: i686-pc-windows-gnu
+    ARCH: x86
+    BITS: 64
 
 install:
+  - IF "%MSVC%"=="" set PATH=C:\msys64\mingw%BITS%\bin;C:\msys64\usr\bin;%PATH%
   - python src/etc/install-deps.py
   - python src/etc/dl-snapshot.py %TARGET%
-  - call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %ARCH%
   - SET PATH=%PATH%;%cd%/rustc/bin
   - SET PATH=%PATH%;%cd%/target/snapshot/bin
   - rustc -V
@@ -23,7 +29,3 @@ build: false
 
 test_script:
   - cargo test
-
-branches:
-  only:
-    - master
-- 
2.30.2